Skip to content

refactor: make bzlmod directly aware of created toolchain repo names #2885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

rickeylev
Copy link
Collaborator

@rickeylev rickeylev commented May 16, 2025

This makes python_register_toolchains return the repo names it created, which allows
the bzlmod code to be directly aware of the repos that were created instead of having
to rely on assuming the names via the platform keys.

This is to facilitate python_register_toolchains creating a more arbitrary subset
of platform-specific repos.

Work towards #2081

@rickeylev rickeylev force-pushed the refactor.bzlmod.flatten.tc.registering branch from 0f0160d to acf4136 Compare May 17, 2025 18:15
@rickeylev
Copy link
Collaborator Author

Ready for PTAL; dependency PR merged

Copy link
Collaborator

@aignas aignas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Comment on lines +278 to +279
for i, toolchain_info in enumerate(py.toolchains):
is_last = (i + 1) == len(py.toolchains)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
for i, toolchain_info in enumerate(py.toolchains):
is_last = (i + 1) == len(py.toolchains)
all_toolchains = zip(
[False] * len(py.toolchains),
py.toolchains,
)[:-1]
all_toolchains.append(
(True, py.toolchains[-1])
)
for set_python_toolchain_constraint, toolchain_info in all_toolchains:

You could do this, I am curious what is more readable.

Also, I can't remember if the last toolchain is still special because we always know the python_version flag setting, so the comment/logic may be outdated. At least when I was bugfixing code in this location I think that the case when the python_version does not match the preceding entries never happens in bzlmod.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

re: if no-version occurs: Good point. It would occur if...hmm...If --python_version was set to a version that wasn't known? This could occur if someone registered a toolchain outside of python.toolchain()

@rickeylev rickeylev added this pull request to the merge queue May 18, 2025
…into refactor.bzlmod.flatten.tc.registering
Merged via the queue into bazel-contrib:main with commit 9de326e May 18, 2025
1 of 2 checks passed
@rickeylev rickeylev deleted the refactor.bzlmod.flatten.tc.registering branch May 18, 2025 23:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants